Allow StreamSource system ID to be set explicitly

Addresses the last of the System ID stuff in #1