In our setup, we are using UTMs instead of CID, but I would expect that in both cases you need to do a little manual intervention...
In order to maintain your Marketing Channel rules, reading your CID data, you will need to ensure that the CID is still a part of the URL that is being sent to Adobe...