Change to work with 'untyped' type/object ids