Model: removing old default of data

Data used to be defaulted to the id if data was not provided.
We need this to be more specific, i.e. if the only option is an object.