fix double construction of UserObject
Make more objects OM-Aware