Always lookup before registering objects

Revert this commit once the bug has been properly fixed in either the
database, or persistent.