Fixing dumb mistakes

Mistake in allocation logic, forgot to assign explicit ids in my model
layer. derp