Object ID refactor and missed fn name
changed id to uid