Will you move into a one bedroom unit this year once your current lease expires this June or July?

That will certainly let him know it's over. You could even text him and ask him to keep an eye out for a nice cosy, intimate one bedroom unit for you. A unit that's friendly for one.

Let him know you would appreciate help with packing and moving. He'll know he's solidly in the friend zone by that point.