Move ::id from find to entity function