Hey Azrael,
If Naomi is stuck in her room, you may need to do other quests involving Naomi, Lyriel or other characters who would occupy the rooms that these characters need for certain quest triggers.
Can you try doing that and letting me know if it works?