i would try just watchng him to see how he goes. dd moved into her bed around 18 months (after cosleeping from birth). i remember one night hearing her wake but being so tired it took me a little while to get to her. by the time i got there she was calm and asleep again. it was then i realised she was just moving through sleep cycles.

every time that we did go to her, we showed her where he drink bottle of water was, and after awhile she was able to get it herself if she needed a drink.

hope tonight you both get some rest.