Shift ObjectIdSubstitutor to own file
This is the new fire-and-forget-for Scala 2.10, right?