test-match-trees: convert to use struct object_id