Fix API to stick with implementation (models have `id` fields and not
`model_id` fields)