R1:3b65864ee110

Fix two minor bugs with recent patches:

- Use the computed remote URI (which may have an explicit 'ssh://' under Git in some cases).
- Use '$id' correctly rather than casting the URI to an int in the message parser.