Air Venturi Avenger Thread size

I want to be able to use the Donny FL moderator from my RAW HM1000X on my Air Venturi Avenger. Can anyone tell me the thread size for the end of the barrel. I'm guessing M18 x 1.5. I am going to have my buddy machine an adaptor
It's

M24 x 1mm​

on both ends.

I can make you a thread CF shroud.

unnamed.jpg