Replace instance of uid with id