When to move my son out of the nursery.

So we’ve been talking for awhile about moving my sons room since the nursery is right by our bedroom. He’s already in a toddler bed but we have the issue of no where to put all of the crap in the spare bedroom... we would put it in our loft but we currently have a roommate in there who hasn’t made any effort to find somewhere else to go after being here for over a year. Originally he was only supposed to be here for 3 months 🙄 problem is he’s a good friend and paying rent to stay. We’ve also talking about moving in the fall so we can’t decided if we should just wait it out and see what happens or kick the roommate out and set up the room even though we may not be here.. I just feel so hormonal and impatient to get things moved and these boys are just dragging their feet and taking their time (boys being roommate and husband.) what do you guys think, should I just start setting the room up anyways? I just don’t want to be overwhelmed this summer rushing to get things done if we don’t move. Also baby is due August 20th so right when all of this is happening 🤦🏼‍♀️ I don’t want to make it more stressful than it already is. Help 😫 any advice or encouragement is welcome.