Split ObjectModelFactory out of ObjectModel