Use more robust workaround for oid collisions