Spoiler. Have wine with Mary and after doing "activities" with her, meet her again on the main floor. She'll tell you where to meet Oliver.
