Replace Id case class wrapper with type alias