Use proper instance id for overrides