changed mapping of values and consts to object_id based