Make sure all create calls use oid collision workarounds