Replace UserId class with Id<User>
Implement hashCode & equals on Holder<T>