Replace usage of ID's with actual objects

since we are working with ORM, we should use objects themselves rather than their ids http://fisheye.jtalks.org/cru/POULPE-2#CFR-2893

Look for similar cases throughout the other classes as well