Thanks all. I'm going to try the simplest method: just run git annex assistant on both machines, drag the music dir into the annex on both machines, and let it deal with it. Some unnecessary transferring and temporary on-disk duplication should not be a problem. I've made a backup first, just in case.