Fix ObjectIds that weren't unique
Use the "schema" collection for schemas