Refactoring map ids into game objects