這一句應該用 "until then" 定 'by then" ?

I'm moving into my new flat next week. I'm staying with a friend until then.
用 by then 意為”到那時(達成某目標，需依詞意判斷為過去或未來)”與 ”我下週會搬入新屋，我目前持續與一位朋友在一起”句意不合。
until then意為直到那個時間，與這句句意合
(我下週會搬入新屋，我會持續與朋友在一起”直到下週”)

I'm moving into new flat nest week and have stayed with a friend until then. Yip