He is on the move like most babies that age.

To me it sounds like you might have to move him into a cot.
Yep, I agree!