fix api for loading aggregate
moved id enrichment away from repository into main object