Hack model move to guarantee usage of correct persistent objects (OMS-345)