Change type of type/object ids to java.lang.Object, since impls are likely to require different actual types