I think I'm starting to understand why you made the models/ids change. It's because the models aren't in the common package anymore. Hmm. Maybe this is OK then.

Would it make any sense to have a superclass for the models that does live in common, and the server-specific stuff subclasses it? Or would that not gain us much?