Clearer and more isolated aggregates

Currently the aggregates have direct references to eachothers roots; replace this with identity references.

Note from @orende
"I recommend doing this after the JPA migration. It's not a trivial change given the considerable complexity of JPA annotations, but should be possible with enough study of the documentation."