@fiery_enzyme: the tyre upsize u mentioned is the correct one.
regd the rims, it's always advisable to go run tubeless tyres on alloys. the rim width has to be between 4.5J and 6J. dunno the stock rim size on a M800, but if it is anything less than 4.5, u gotta change them (good excuse to upgrade to alloys
)