6 week baby sleep woes

After s nightly cluster feed my baby was sleeping from 9pm to 12:30/1am....a much needed few hours of sleep for mom! He then would wake every two hours after that but once I got those 3-4 hours I could manage the rest of the night without sleep deprivation the next day. Now he is 6 weeks and back to waking every hour or two (even right after a cluster feed). He also only takes 30 minute naps during the day. Everyone says how babies sleep so much...not mine! Anyone else experiencing good sleep that went away around 6 weeks?