Fix issue where OBJECT_ID wasn't using schema