Had to adapt quite a lot of code due to the usage of Id for org.matsim.matrices.Matrix. Changed Id to String in Matrix as matrices were used to refer to lots of different things, the fewest of them having an actual type (class) to be used as type in the new typed Ids.