submodule: convert merge_submodule to use struct object_id