Use owner_id instead of proxy object. Closes #589